Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 8 Jun 2011 21:36:31 +0000 (14:36 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 8 Jun 2011 21:36:31 +0000 (14:36 -0700)
commit5a8a87f4136603a9a01df9a07fca360eff28a1fc
treeeb9c31aa294a79baf223edd6d349d09414cff788
parentb37538435f541b5701150852e584855f569edb31
parent2bc31eeb167678bace14c944af73b2adfd39ddf2
Merge from trunk.
src/ChangeLog